acdc0b1655f7f78cd093d17f5faa31f78885f725,OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java,VoiceRouter,playMakeTurn,#RouteSegmentResult#RouteDirectionInfo#NextDirectionInfo#,701
Before Change
if(isplay) { play.then(); }
play.roundAbout(nextNextInfo.distanceTo, nextNextInfo.directionInfo.getTurnType().getTurnAngle(), nextNextInfo.directionInfo.getTurnType().getExitOut(), empty);
} else if (nextNextInfo.directionInfo.getTurnType().getValue() == TurnType.TU) {
if(isplay) { play.then(); }
play.makeUT(nextNextInfo.distanceTo, empty);
}
isplay = true;
After Change
CommandBuilder play = getNewCommandPlayerToPlay();
if(play != null){
String tParam = getTurnType(next.getTurnType());
boolean isplay = true;
if(tParam != null){
play.turn(tParam, getSpeakableStreetName(currentSegment, next, !suppressDest));
} else if(next.getTurnType().isRoundAbout()){
play.roundAbout(next.getTurnType().getTurnAngle(), next.getTurnType().getExitOut(), getSpeakableStreetName(currentSegment, next, !suppressDest));
} else if(next.getTurnType().getValue() == TurnType.TU || next.getTurnType().getValue() == TurnType.TRU){
play.makeUT(getSpeakableStreetName(currentSegment, next, !suppressDest));
// do not announce goAHeads
//} else if(next.getTurnType().getValue() == TurnType.C)){
// play.goAhead();
} else {
isplay = false;
}
// add turn after next
if ((nextNextInfo != null) && (nextNextInfo.directionInfo != null)) {
String t2Param = getTurnType(nextNextInfo.directionInfo.getTurnType());
if (t2Param != null) {
if(isplay) {
play.then();
play.turn(t2Param, nextNextInfo.distanceTo, empty);
}
} else if (nextNextInfo.directionInfo.getTurnType().isRoundAbout()) {
if(isplay) {
play.then();
play.roundAbout(nextNextInfo.distanceTo, nextNextInfo.directionInfo.getTurnType().getTurnAngle(), nextNextInfo.directionInfo.getTurnType().getExitOut(), empty);
}
} else if (nextNextInfo.directionInfo.getTurnType().getValue() == TurnType.TU) {
if(isplay) {
play.then();
play.makeUT(nextNextInfo.distanceTo, empty);
}
}